collect the arguments with gtk_container_child_args_collect, not through

Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkcontainer.c:
        (gtk_container_add_with_args): collect the arguments with
        gtk_container_child_args_collect, not through gtk_object_args_collect.
        (gtk_container_child_set): likewise.

(cut 'n paste strikes back)

diff --git a/ChangeLog b/ChangeLog
index f768c3f1521dc723e0dcc91a9032f9072d6243ab..2edef03d8d9b4c3eec89e8dbebacff963a3381a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcontainer.c:
+       (gtk_container_add_with_args): collect the arguments with
+       gtk_container_child_args_collect, not through gtk_object_args_collect.
+       (gtk_container_child_set): likewise.
+
 Fri Jul 10 04:20:35 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f768c3f1521dc723e0dcc91a9032f9072d6243ab..2edef03d8d9b4c3eec89e8dbebacff963a3381a8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcontainer.c:
+       (gtk_container_add_with_args): collect the arguments with
+       gtk_container_child_args_collect, not through gtk_object_args_collect.
+       (gtk_container_child_set): likewise.
+
 Fri Jul 10 04:20:35 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f768c3f1521dc723e0dcc91a9032f9072d6243ab..2edef03d8d9b4c3eec89e8dbebacff963a3381a8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcontainer.c:
+       (gtk_container_add_with_args): collect the arguments with
+       gtk_container_child_args_collect, not through gtk_object_args_collect.
+       (gtk_container_child_set): likewise.
+
 Fri Jul 10 04:20:35 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f768c3f1521dc723e0dcc91a9032f9072d6243ab..2edef03d8d9b4c3eec89e8dbebacff963a3381a8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcontainer.c:
+       (gtk_container_add_with_args): collect the arguments with
+       gtk_container_child_args_collect, not through gtk_object_args_collect.
+       (gtk_container_child_set): likewise.
+
 Fri Jul 10 04:20:35 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f768c3f1521dc723e0dcc91a9032f9072d6243ab..2edef03d8d9b4c3eec89e8dbebacff963a3381a8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcontainer.c:
+       (gtk_container_add_with_args): collect the arguments with
+       gtk_container_child_args_collect, not through gtk_object_args_collect.
+       (gtk_container_child_set): likewise.
+
 Fri Jul 10 04:20:35 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f768c3f1521dc723e0dcc91a9032f9072d6243ab..2edef03d8d9b4c3eec89e8dbebacff963a3381a8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcontainer.c:
+       (gtk_container_add_with_args): collect the arguments with
+       gtk_container_child_args_collect, not through gtk_object_args_collect.
+       (gtk_container_child_set): likewise.
+
 Fri Jul 10 04:20:35 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f768c3f1521dc723e0dcc91a9032f9072d6243ab..2edef03d8d9b4c3eec89e8dbebacff963a3381a8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkcontainer.c:
+       (gtk_container_add_with_args): collect the arguments with
+       gtk_container_child_args_collect, not through gtk_object_args_collect.
+       (gtk_container_child_set): likewise.
+
 Fri Jul 10 04:20:35 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktypeutils.h: 

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 240d1b743b16ac533c2d87fefb6ee123715350ac..c5a236d6ccca86ae385d73796d43a29040698a81 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -300,10 +300,10 @@ gtk_container_add_with_args (GtkContainer      *container,
       gchar *error;
       
       va_start (var_args, widget);
-      error = gtk_object_args_collect (GTK_OBJECT_TYPE (container),
-                                      &arg_list,
-                                      &info_list,
-                                      &var_args);
+      error = gtk_container_child_args_collect (GTK_OBJECT_TYPE (container),
+                                               &arg_list,
+                                               &info_list,
+                                               &var_args);
       va_end (var_args);
 
       if (error)
@@ -418,10 +418,10 @@ gtk_container_child_set (GtkContainer      *container,
   g_return_if_fail (child->parent != NULL);
 
   va_start (var_args, child);
-  error = gtk_object_args_collect (GTK_OBJECT_TYPE (container),
-                                  &arg_list,
-                                  &info_list,
-                                  &var_args);
+  error = gtk_container_child_args_collect (GTK_OBJECT_TYPE (container),
+                                           &arg_list,
+                                           &info_list,
+                                           &var_args);
   va_end (var_args);
 
   if (error)
@@ -475,6 +475,7 @@ gtk_container_arg_set (GtkContainer *container,
          return;
        }
     }
+  g_return_if_fail (info->arg_flags & GTK_ARG_CHILD_ARG);
   
   if (! (info->arg_flags & GTK_ARG_WRITABLE))
     {
@@ -525,6 +526,7 @@ gtk_container_arg_get (GtkContainer *container,
          return;
        }
     }
+  g_return_if_fail (info->arg_flags & GTK_ARG_CHILD_ARG);
   
   if (! (info->arg_flags & GTK_ARG_READABLE))
     {